From d04b137ea76571e9e5f90625a7d96c4eb964a223 Mon Sep 17 00:00:00 2001
From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Thu, 19 Feb 2015 12:43:57 +0000
Subject: [PATCH] tools/libxl: Do not use remus teardown paths for non-remus
 guests

It causes a suspend failure to emit

  libxl: error: libxl_dom.c:2035:remus_teardown_done: Remus: failed to
  teardown device for guest with domid 17, rc -3

for all domains, including those not using remus at all.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
CC: Ian Campbell <Ian.Campbell@citrix.com>
CC: Ian Jackson <Ian.Jackson@eu.citrix.com>
CC: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
 tools/libxl/libxl_dom.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c
index 48d661a5d4..a16d4a1004 100644
--- a/tools/libxl/libxl_dom.c
+++ b/tools/libxl/libxl_dom.c
@@ -2007,7 +2007,7 @@ static void domain_suspend_done(libxl__egc *egc,
                            dss->guest_evtchn.port, &dss->guest_evtchn_lockfd);
 
     if (!dss->remus) {
-        remus_teardown_done(egc, &dss->rds, rc);
+        dss->callback(egc, dss, rc);
         return;
     }
 
-- 
2.30.2